Added extra relations in M3 for experimentation.
Removed link between M3 and AST and changed types to locations (for now)