Adds initial support for sub-module descriptions