Added custom tags support