Added support for map parameter types (closes #17)