Object Oriented fixes.