Added support for computation plugins
Edited comments