Improved the list module