step.1 (db) fixes - added constants in model