Temporary hacks; started XML definitions file