Improved setup file