Refactored Achievements, implemented Achievements extension methods