Add calculated properties