fixed add activity and added lazy fetch to collections