Updated to fully drop support for API Versions < 8