Changed implementation of List