Improve input types (Issue #134)