Added more Units and Elements