Added segmentation for Account