Improved setup / build