Composite handler source would more perfomant + minor changes