Added async support for locals/data