Fixed namespace
Added input types