Fixed access modifiers for inner classes to avoid classloading issues