Added content saving and serving