Identify more input sources, simplify actions