Uncomment relational generations and add obstacle resolutions.