refactored account and contact media