Better support for ContentBlock/Content