Improved Config & Added ClassShare