Added minimal Goal insertion