cont ... modfiy model classes