Added more default values