Unified functions and values into one set of defs