Added support to change final fields