Added code to alarm types
Added missing files from 79c22de