Replaced usage of `__mods` with `mods` and used method calls instead of manual calls