Block domain and infra
Keep blocks with published version
Better versioning logic