Changed attribute macroses to $(…) macro