This should be marked as depreceated, likely to be removed.