added additional entity connection functionality