Adding auto setup