Added more default options