Change to PersistantList. Now uses Generics.
Merge remote-tracking branch 'origin/master'