Updated common utilities with the latest code