Switch overhaul and more object base features