Added support for effects;