Issue 189 marketplace async