Added main logic classes