Fix support dictionary types