Builder and Delegate changes

I've added a few bits to make the library easier to work with.