Refactored blocks field