Added data store and search files
Updated build.xml to set the arguments to use those files
Some other small updates