Add type to variables