Updated list implementation