Removed direct reference to database name as this changes from debug/production|