Aggregation minor fixes
Resource sharing task
Miscelaneous improvements