API Additions and Multiple Context Support