Added enum for diagnostic boards; refactored maps