Added generic edit and new