Added support for very light validation