Added configurability