more materialization
more changes for dependency management