Tag Improved flexibility