Big update: Adds 1.6.4 support