Added validation
Added emittable