Updating extension to not require experimental APIs