First commit of multiple key schema
Test/verify code
Fix for triggers when users has null key
Rename key to public_key