Added pojos and loader