Add remaining definitions. Compilable as is.