Framework core and events class update
Double quotes errors fix