added environment variables support