Updated according to recent announcement that 'library.classes.*' import not necessary