Improve semantic functionnality + fix issue #9