Moved to a more generic config setup...