Updated mockups and Class Diagram