CoreSystem improved when goal id exist