Improved more code semantic