Dereferenced wrappers, refactoring