Fix circular dependency in the models modules