Add missing enum properties to Goal model

more work towards polishing #5 

/cc @fcduarte @amitbharadwaj