Add classes for Goals