Expanded universal.h