FIX: Better raw support