Added client shell + Fixed aggregation bug