Removed context from DataWrapper