Move to using OO finfo interface