Added static model matcher. Added error signalling and remove assertions