Included the missing switch args for constructing