Modules now work with static too