Improved to enable the list functions