Updating to work with Common-CSS