Added extension parsing