Adding support for Hybrid mode

This close #765