Update Hybrid Engine, add per app expand