Update to master
Add id and visibility to Item