Removed idFromData and replaced with method on Data interface