Make classes work for additional-methods

Enable classes for additional-methods