Add support for 1.8.1 and fix bug with download link allocation