Added support for async loading of data