Fixed Entity[] persistence; less code.