Added data layer and xml parser