Rework initialisation