Better checking for module