Added subtypes, popup menu for editing, and syncing