modified account namespace