Second start at async support