Removed circular dep