Added more IDs to the objects and support notes updating dynamically