Adding more basic ops, searching for modules/classes.