Full 1.6.1 Support