Added more arguments to parse