Moved achievement validation to service class