Add aggregations and styles, change name