[C] - username and password fields for Machine
[P] - added step parameters support