Improved Custom Values File, and renamed some methods