Update new hooks and cleaner REST APIs