Use a builder?