Moved edit features to plugin