CON-1542 | Add background logic