Added new shelf file, and minor changes in Manager