Feature/rich reporting