Improved initialization