Updated to new extension format