Updated Class builder to also implement a C++ style API.