Fixed local var hiding global var (sonar major issue)
Hopefully fixing non-transient non-serializable instance field issue for EntitySchema (sonar major issue)