Make as singleton, rewrite where function

Signed-off-by: Aleksey Snisar <osni@isd.dp.ua>
Add description

Signed-off-by: Aleksey Snisar <osni@isd.dp.ua>