Position and Unit class updated