Added preprocess and configure