Updated Depreciated methods to work