Removed circular references to algorithm base