Refactor Observable and provide additional instances