Unit loading added

waiting for final API