Make report more general