WIP - In the process for fixing usage of 'env' variable to detect 'development' or 'production'