Changed to be more backwards compatible since we're deprecating anyways