Fixed schema declaration

Using Map<>'s as our schema declaration result in errors because
any keyset iterator over said maps would not guarantee an ordered
iteration. Instead, we're replacing the schema invocation with direct
usage of Fields.