Updated with class and Architecture diagrams