Updated to not use extras
Added xml reqs.