Removed circular dependencies