[SAF-56] Increasing the visibility of the delegate and the builder constructor to allow extensions