CONN-1148: Updated review comments and added Entity and Adapter Schema Elements.