Just a few imports and xml changes