Add modes
Remove redundant extensions