Added more input features