Added new custom tags