Modified amendment building to use builder class rather than extension
methods