Added mock builder prototype.
Improvements to mock builder prototype.