Simplify type design