Added Config handling