Added validity checks