Partially implemented the 0.4 support for private API.