Updated to work with 0.3.1