Updated with non-regex goal description adds