Added type support and var definition (not tested yet)