Updated definitions and preseeds