This PR includes: * Adding parameter types * Fix validate-modules issue * Improve parameter types and resulting changes This PR needs to be verified and tested by maintainer(s).