[WIP] Cleaner XTC interface