Added more features to the input.