refactoring of class mapping definition and schema