Schema changes. Implementation and junit tests updated.