added remaining entities