simplify wrapper structure