Verified tag inheritance and cleaned up changes