Fixed creation and deletion (added new extra fields for note)