Enhanced content management (unfinished).