Add CustomProperties support