Could you open a follow-up JIRA for implementing these features (replace and add)?