release candidate2. Updated the UML diagram and made few small corrections