Added support to add and delete elements