move input definitions to the class which use them