Use real definitions in oset instead of overloads