Feature/mob 2395 singleton