Update step in line with new User model
Update feature steps