Better database structure; no SQL in report