Fix: Uniformize field type