removed blank spaces + add ModelQuery class