Improve itemprop and property object