Changes to Module pattern