Deal with enums a little better
Supporting multiple parameters.