Added todos and fixmes for property mappings