added blockCollection, container, page and updated everything else