Less parameters,  use closure values directly -> less parens
Added new tags