Renamed builder method and idiomatic changes