removed named fields from implementation of mapping