Improve Annual Report functionality