Removed the 'extends Match' declaration from Match.Builder and added only the getters from Match into Builder.
Fixed builders templates accordingly.