Adding import and some load logic