fixed deprecation issues with new module format