Main app class updated