Change from v4 support library to v7