Change access modifiers to allow for more control from RPM