Removed circular dependency