Release v2.6 (BIG Refactoring)