It's a little odd that we still have ``store_as`` and ``store_on_contact`` here but if it's hard to remove them I'm okay with that for now.