Added happy-path prefix-matcher
Integration merge with master
Added error handling