Add functionality for multiple unit types