Added db creation + Env namechange