Added better unit support