Fixed circular dependency problem in modesl.