Replace explicit steps by using a table