Use a real builder object

Use a real builder object instead of faking the internals