Added new fields, changed structure of contact/keymasters and feeds