Implement minimal set to support modules and module structure
Implement minimal set to support modules and module structure