Added support for additional algorithms