Additional initial setup