Make setup smarter