Added Report and Area support