Improved functionality for easy configuration