Add easier reference to contact/resource from messages
Handle more edge cases
Save changes