Making the wrappers a little better