redesign db scheme