Started working on PropertyList that will replace Collection and fixes