ERT-711 Removed logy and moved to separate "class"