Regarding the implementation, I'm in favour of updating curator and using that.