Tag: enhance flexibility