Added some stuff, still busy with matcher for compatibility chek