Improve kickstart support