Improved and added tags