Correct load order
less verbose
Added lazy loading