Fix class constraints for more modules