Updated Common and Words to Avoid Circular Dependency