Refractored NoteDAO after reimporting db