Added metadata injection support

Also generated schemas will now follow the field order defined in the
step.