Adding support for the rest of tag end-points and removing un-used logic from the adapter