Refactored passing of parameters, added conventionAgnostic option