Updated for PoE Version 0.10.1g