Changed KitApi to use less methods