Commit 6: Environment variable added (environment determines DB)