New database structure (removing redundancy)
Resolve merge conflict