Goal-Entity, more refactoring, JsonHandler