Maintain field order of insertion

Closes #30