Use more generic types where possible for input parameters (#1584)

Use more generic types where possible for input parameters (#1584) #605