Adds support for handling modules