Add proper async sync