Extents management fix and encryption added