Removed circular dependency for itself