Added builder classes, update abstracted base builder