Improved init script