Adding some features to the Goals features.