Tag support and minor fixes

Added support for tags and updated the helpers to the new syntax where
needed.