Added module version and performed Named refactoring