added calculated fields and its variants w/ aggregation
added parameters and manualhierarchy