Adding TMX 0.9.0 features