Removed dependency on deprecated Extension DatatypeContext