Using .env file to store constants
Merged from development