Added exceprt extraction