Added data and modified rake tasks