added definitions for most units available