(BUG #1133) Removed the fixed shape module name.
(BUG #1133) Removed the fixed shape module name.
Additional validation.
Adapting to new asset structure.
Adapting to new asset structure.