Added selection management and deletion