Add GLUE2 support