Added keep selection property