fixed namespace, added new abstract model