changes to support otherEntity