Done the refactoring necessary for having achievements searchable in a pretty way