First attempt at configurability