Added DB skipping clause for better debugg