added db, database, environment, etc..