Marco changes

Marco changes (basically only the property names)