Added v5 support and solved a few other bugs