Fix parent mapping
Make the property param optional