Removed the need for @SuppressLint("NewApi")