Modified to enable pod and dictionaries in parameters