Tag: Enhance flexibility