Adding functions and classes