Added definitions model and users working