v2 - Change to Class and pyechonest