Changed design for lists