Replaced exclude with fields