Reduce dependence on fields