Added support for module inclusion in class. Also, modified the DSL coding
style.