development: Updated properties to handle undefined keys