Initial version of cdh51 shim