Update Content module, better scheduling/expiration support