Fixes implementation of observables to be lazy load