Added pre validate