Updated the UML design and create sample screen shot