Added main entities