Added more container extensions