(WIP) Add more complex matchers to observer