Added support for module schema parse
Merge branch 'develop' into user