Adding Goals and Category models