Adding type support and lot of fixes