Change validation a bit. Real implementation pending