Improve setup module