I changed it to your option. As for me it's right to have only attribute components in that constant but I would love to hear something from @carlosantoniodasilva as well :)