Data ecternalized and descriptions added