Updated to use Emittable
0.5.0