Move select cases into its own definition file