Added support for extra operations