Add missing files
Revert private to protected field changed: not needed