Update to tomkit