Lists functionality modified