Content Controller Changes