Improved pre-configuration