added Goal class