Adding to initial server setup