Expand module definitions, previous syntax was breaking require