Background worker added to improve stability