FIX: Split abstructed and tuna