added content_block and defaults