Towards Hybrid and Diversity-Aware Collective Adaptive Systems