Updated to work with 0.0.5