Added partial support for a few more unit types