Use more generic types where possible for input parameters

Use more generic types where possible for input parameters #604