Move everything non-generic from holder base class to specific classes