Changes for better integration with Tlist