Update to konecty's pattern