Updated validation in Analytics Model