Added inputs and modular input kinds.