Add "wrapper" support