Updated to use Emittable
0.9.0