External classes processing added