Changed dependencies from BlocksterMap do BlockMap in several classes.