Refactor API and add existing resue to dataset
Fix activty for org edition
Updated translations