Refacted achievement list