Change to switch class implementation