Added some stuff that got removed from API switch.