Added some missing access modifiers