Changes for standardised configuration (see issue: #6)