Removed user dependencies, allowed configurable models