Updated a few methods, created XML classes