Added more aggregations and literals