Rework id for activities