Better wrappers for FDO