Changes fields syntax to better match shorthand