Use new achievement component instead of global functions