Moved to full module inclusion and not defining methods that then call the module