Started to add handling for amendments