Better step definitions