added missing uses all over the code