Modified schemas to suport collections.