Manual Mode: Add support for OSPi 2.0.4