Remove need for Achievement.getId()