Added loading
Added deferred loading magic