Improvements on manage complex