implemented more things in wrappers