model constructors fixed