Remove unnecessary streamify usage
Add permalink support