Updated to include enumerators and easier relationship navigation