Add ObserverQuery and intial specs