Updating the client to use a metaclass to provide builder based class instantiation.