Update with HPM
Added full support for Rebellion