Updated extension to 0.3.1