Moved data proxying to a method allowing overriding