Updated Builder with some fixes