Add mechanism to get a single account