Add pop feature
Add pop step definitions