Adds goal support.