#392 More setup work