Added add tag utility and updated service to take fully defined/primitive