Made the module more compatible withstuff