Make reports a bit more dynamic