Add option to configure custom tags