EST-384: Move validation method to appropriate place