added remove element support