Updated loading

Signed-off-by: Max Sikström <msikstrom@op5.com>