Updated step definitions