Pulled inner class into own class
Upated class diagrams