Changed access modifiers to package-level