Updates class structure, removes threading overkill on keep available, fix bug when initialize from settings.