Add Makefile. Updated DataSource JavaDoc comments.