[IMP] Improved steps snippet controller calls