Merge "Add extensions list"