Added preprocessing handler