Add support for environment variables
Updated TODO