Add module and class scopes for clarity