Added strict option