Added Pojos and Tasks support from Dewayn's repo