Public release; fixed import to unexisting models