Add fallback for propernames not available