Removed message variable.
Added 3 constants for credential keys.