Builder: Add explicit types