Improve import and compare controllers' integration