Add Achievement functionality (Use this one instead of the other one)