cleanup loading
When we will be able to rely on return impl, this can be cleaned up further I think, but in the mean time this shaves off a lot of boilerplate
When we will be able to rely on return impl, this can be cleaned up further I think, but in the mean time this shaves off a lot of boilerplate