Do some further sources optimization