Updated to use Emittable
0.3.0