+ complete orm mapping, add fk indexes