Adds more functions/macros