Updated user stories and created queries