Moved state from Observable to Observer