Final builder implementation added