Updated to match SPEC project for field types and conversions