All Account-related context moved to Account trait (as was agreed)