Some access modifiers changed