Fixed lefover argument
Adapted data object to the new property macro