Added functionality for loading