Moved initialization into preinit