Adding an optional prefix for DBs + comments less verbose