changes for new implementation to export all detail