Refactor to make backwards compatible and deprecate old methods