More tweaks and changes
Add dependency to server_setup