Some changes to Module API.