Update to integrate with UI templates