Add back IPI support