Stop storing base-table's ID as sub-record