Add type and width stuff