[ issue #6 ] Updated some definition