Added Validation. Changed queue to event