Removed Switch dependency