Moved property information to objects themselves