Add salmon support (WIP)