Adding dependencies explicitly
Fix validation code