Added more options to default setup