Added module.exports support