Changed builder api