Update interface
Merge patch support and updated interface