Improved init setup