WIP: trove related enhancements