FIX: Fix and test trans support