Little changes to start support validation