Working with latest PoE version