Reduces dependencies to api8 (previously 9)