[-] types fix

--HG--
branch : Types refactoring