Relocated the add and edit command handlers into a common class.