Added support for creating proper kitsh environment