Remove typesafety from builders constructors