Generalized privacy and security to all requirements (closes #11)