Looks good. Wasn't aware of those classes. Pushing an update to use them.