Added inclusion of default property if defined