Updated to use Core 0.2.0.