First pass at updating resources to expose their lazy internals