Fixed circular dependency problem