adding support for users and environment variables