Added Note and Location classes