Improve setup