US/63 many to many refactor