Map contributions, rework background worker logic