Some refactoring which makes the use of runtime model parameters more generic (#142).