Started to add support for amendments view