Commission fields modification ready for validation (#226)