Added validation to content fields that are mandatory
Revert this change, as it was misusing the block_content method
Merge conflict