Maintain backwards compatibility with previous method