Upgraded CMS and extensions

#5
Fixes #2