Improved Rake file