Added support to tag images with categories