Fixed wrong code example
Added support for tagging