model refactoring: removed dependence of string constants