Update to provide simple interface and no wrapping of objects