Add unicorn support

This includes and should be merged after the other pull requests related to small bugfixes.