More data validation. New Database