Upgraded the language to use qualified names and imports