Add edit, delete, rename space support