Adding parameters and logging
3 files changed