Added module structure