Fixed the 'already initialized constant TAG' warning by converting to class level methods