Security classes cleanup.
+ add email attribute