Added worklist to get rid of stack overflow
Remove static fields from Persistent