Clarify magic number
Add in Communication and Signing keys