Support for blocks that return additional parameters.
Added detecting controller type.