Any possibility this can be a feature request for the next version?