Add namespacing and fix the input component