Added support for compact and standard report types