added ability to have custom tags