Imporved configuration and initialization