Adding parent/child relationship and table expansion