BLK-26 Fixes keyword arguments on parameters

Signed-off-by: Oren Leiman <oleiman@neutral.io>