added support for tags and all
added