added new using statements

unsure about whether to remove typedefs as it will break the world