Updated so that it doesn't require new properties and uses either available values or sensible defaults