Add gcj support