I suggest you leave these schemas just the way they are.