Added changes for the semantic from @monedaTeja