Re-adding start/end validation