* Context loading updates (v0.4)