We don't currently have delivery classes for those, but we can move them and add indexes.