prevented collision with global classes and added smarter faker property check