Added more funcionality to customize the list