Added intermediate tables