Added support for loading data