Code adjusting for import plugin