Add PickAndStore objects, services and validation