Improve simple setup