Common fields optimisation