Fix Step definition that it can handle primitive types