Added add and set functionality