Create real Builder for customization

@espinichi please check this new Builder now!