Add extended editing abilities, updated view models