Include all imports and better catalog in example