Configuration reworked - closes #28