Modify builder class