Amended db scheme