more content abstraction changes