Removed unnecessary Builder and fix merge issue. Fixed #520