Added input-related funtionality