Fork CMS additions + basic lib