Add explicit validation