0.6.5 support + helper functions