Refactored Parameters. Fixes #132