Improve step definition
Fix config object references