Add custom tags support