Recast wrapper and more