More work on the Setup package