Move validation to proper location