Changes to check and capture extensions.