Some doctrine relationships added and some others corrected.