Done with  achievements implementations. Both types are added.