Added support for base SDK < 8.0 while retaining 8.0 features