Update the Content module, add better scheduling/expired support