Added edit and add features