Kits now use data API + fix all warnigns