Improved initial setup