Basic tagging in place
schema merge