Finishing final touches on the protection classes; access list and connection throttling
Merged a conflict in the adapter impl