Remove TODOs
Use PublishedManager for related properties