Add more capability for configuration