Reworked architecture to make manageContacts reliant on Account ID