Schema changes, implementation and tests updated.