Added support for pick/drop using dynamic routes