Replaced functionality to be backwards compatible