Add reference support